| 
                
               | 
              
                
               | 
              
                @@ -69,7 +69,7 @@ def clerk_oauth(request): 
               | 
            
            
            
              | 
                69
               | 
              
                69
               | 
              
                     distributors = [distributor.admindata for distributor in distributors] 
               | 
            
            
            
              | 
                70
               | 
              
                70
               | 
              
                  
               | 
            
            
            
              | 
                71
               | 
              
                71
               | 
              
                     try: 
               | 
            
            
            
              | 
                72
               | 
              
                
               | 
              
                -        clerk = SaleclerkInfo.objects.get(brand_id=brand_id, unionid=unionid) 
               | 
            
            
            
              | 
                
               | 
              
                72
               | 
              
                +        clerk = SaleclerkInfo.objects.get(brand_id=brand_id, unionid=unionid, status=True) 
               | 
            
            
            
              | 
                73
               | 
              
                73
               | 
              
                     except SaleclerkInfo.DoesNotExist: 
               | 
            
            
            
              | 
                74
               | 
              
                74
               | 
              
                         clerk = None 
               | 
            
            
            
              | 
                75
               | 
              
                75
               | 
              
                  
               | 
            
            
            
            
            
              | 
                
               | 
              
                
               | 
              
                @@ -86,10 +86,10 @@ def clerk_oauth(request): 
               | 
            
            
            
              | 
                86
               | 
              
                86
               | 
              
                 def clerk_submit_api(request): 
               | 
            
            
            
              | 
                87
               | 
              
                87
               | 
              
                     """ 店员授权信息提交 """ 
               | 
            
            
            
              | 
                88
               | 
              
                88
               | 
              
                     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
               | 
            
            
            
              | 
                
               | 
              
                89
               | 
              
                +    distributor_id = request.POST.get('distributor_id', '')
               | 
            
            
            
              | 
                89
               | 
              
                90
               | 
              
                     unionid = request.POST.get('unionid', '')
               | 
            
            
            
              | 
                90
               | 
              
                91
               | 
              
                     openid = request.POST.get('openid', '')
               | 
            
            
            
              | 
                91
               | 
              
                92
               | 
              
                     phone = request.POST.get('phone', '')
               | 
            
            
            
              | 
                92
               | 
              
                
               | 
              
                -    distributor_id = request.POST.get('distributor_id', '')
               | 
            
            
            
              | 
                93
               | 
              
                93
               | 
              
                  
               | 
            
            
            
              | 
                94
               | 
              
                94
               | 
              
                     if SaleclerkInfo.objects.filter(clerk_phone=phone).exclude(unionid=unionid).exists(): 
               | 
            
            
            
              | 
                95
               | 
              
                95
               | 
              
                         return response(SaleclerkStatusCode.CLERK_PHONE_ALREADY_EXISTS) 
               | 
            
            
            
            
            
              | 
                
               | 
              
                
               | 
              
                @@ -110,12 +110,14 @@ def clerk_submit_api(request): 
               | 
            
            
            
              | 
                110
               | 
              
                110
               | 
              
                     } 
               | 
            
            
            
              | 
                111
               | 
              
                111
               | 
              
                  
               | 
            
            
            
              | 
                112
               | 
              
                112
               | 
              
                     clerk, created = SaleclerkInfo.objects.select_for_update().get_or_create(brand_id=brand_id, unionid=unionid, defaults=fields) 
               | 
            
            
            
              | 
                
               | 
              
                113
               | 
              
                +    clerk.user_status = SaleclerkInfo.UNVERIFIED 
               | 
            
            
            
              | 
                
               | 
              
                114
               | 
              
                +    clerk.status = True 
               | 
            
            
            
              | 
                113
               | 
              
                115
               | 
              
                     # 状态为 UNVERIFIED 的允许修改, 其他需要登录摄影师 APP 进行信息的修改 
               | 
            
            
            
              | 
                114
               | 
              
                116
               | 
              
                     if clerk.user_status not in [SaleclerkInfo.UNVERIFIED, SaleclerkInfo.REFUSED]: 
               | 
            
            
            
              | 
                115
               | 
              
                117
               | 
              
                         return response(SaleclerkStatusCode.CLERK_ALREADY_NOT_UNVERIFIED) 
               | 
            
            
            
              | 
                116
               | 
              
                118
               | 
              
                     if not created: 
               | 
            
            
            
              | 
                117
               | 
              
                119
               | 
              
                         for key, value in fields.iteritems(): 
               | 
            
            
            
              | 
                118
               | 
              
                120
               | 
              
                             setattr(clerk, key, value) 
               | 
            
            
            
              | 
                119
               | 
              
                
               | 
              
                -        clerk.save() 
               | 
            
            
            
              | 
                
               | 
              
                121
               | 
              
                +    clerk.save() 
               | 
            
            
            
              | 
                120
               | 
              
                122
               | 
              
                  
               | 
            
            
            
              | 
                121
               | 
              
                123
               | 
              
                     return response(200, 'Submit Success', u'提交成功', {})
               |